Merge branch 'master' of http://git.denx.de/u-boot-sunxi
authorTom Rini <[email protected]>
Fri, 23 Jan 2015 15:22:29 +0000 (10:22 -0500)
committerTom Rini <[email protected]>
Fri, 23 Jan 2015 15:22:29 +0000 (10:22 -0500)

Trivial merge